Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 3 Feb 2011 17:34:50 +0000 (09:34 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 3 Feb 2011 17:34:50 +0000 (09:34 -0800)
commite3efdba28a3296aa08dc08bdd6c6e51e1eb98c9d
tree7942fab1d769832421ec8b7768d91f3e8656d3c8
parente058f5955b34393ee4bbcc98bcf12de8e10197de
parentf5f4f1a95b796147085c329a4b1580071dc2e02d
Merge from mainline.